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

Change-Id: Iddc0babe08b2e1a9abe1bebe117fa66832417cff