[automerger skipped] Merge "Replace BitmapRegionDecoder with ImageDecoder" into sc-v2-dev am: 3e38a2d46e -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16678490
Change-Id: I33701a182f4add9b5b8da2936c6d9de65545afb5
This commit is contained in: