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

[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e5 -s ours am: 26ff1a02 -s ours am: 0e77b7ec -s ours

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

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

Change-Id: I18798a9401d701031b58f9926147507e27c90a3f