[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder"...

[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-v2-dev am: 3e38a2d4 -s ours am: 7ebe9b16 -s ours am: 005b864a -s ours am: 9bd6ff89 -s ours

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

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

Change-Id: Idbb4ed4c88c0857869cdee9e2b340c33cf97f20c