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

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

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