[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-dev am: 7aba92e561 -s ours am: a14f1e84ce -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: Ifdb4b6748a8d3bcbd6e3fa7a54ce5bd5b1615c42
This commit is contained in: