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

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

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