Merge "Fix inSampleSize != 1 gainmap decoding" into udc-dev am: 7ad4c65e29 am: 08f76c7c95 am: c25994add0

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

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