[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e561 -s ours am: a14f1e84ce -s ours am: cb8114beed -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0699193115 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16681833
Change-Id: Id802ee6d3055b9e4e95c91770caccf54014dc211
This commit is contained in: