[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 7d0e0ae85b -s ours am: 9ffe02ae9e -s ours

am skip reason: Merged-In Ie0ea5d0ffa2a4205ec8670d47d0df271ad681a7a with SHA-1 01363671c4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/subsampling-scale-image-view/+/15571619

Change-Id: Ice17895f6a7ab76fb6732940ed638c14ffc0a8f1