[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e561 -s ours

am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0699193115 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16681833

Change-Id: I482f68d39dfc3a42041a7c1581fb111d3d7773d9