Merge "Add an O-release targetAPI check for Canvas.setBitmap. am: d70695ee34" into oc-dev-plus-aosp
am: 172bd07308

Change-Id: I4fdca0f9e9eb4b80832a16aa50cd2cd35b3920a6