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

[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder am: 837917a6" am: 72942497 am: b91ce2fc -s ours am: 261afec9 -s ours am: 0dbc0c39 -s ours am: 26905a94 -s ours

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

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

Change-Id: I1764e4a74069d36759c68481b9c9aff6aea87205