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

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

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



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