Merge "Fix inSampleSize != 1 gainmap decoding" into udc-dev am: 7ad4c65e am: 08f76c7c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23912844



Change-Id: I8a567e82d0a4762908fde9e9bc9a446764fb28e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>