[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into tm-dev am: e96ffa7cba -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0d304b027f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16934525
Change-Id: I954dba4be656a212428c930b79bf4dcc36326ad0
This commit is contained in: