[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder am: 837917a6a3" am: 7294249768 am: b91ce2fc9d -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 837917a6a3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128491
Change-Id: I87568931e04a83036c4bab701c31f65ba972015c
This commit is contained in: