[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into tm-dev am: e96ffa7c -s ours

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

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

Change-Id: I1e2a86ffa98c29e403c11122a4672a166aa4ad82