Merge "Transform & preserve gainmaps" into udc-dev am: 3bc2f704 am: 86d6b96e

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



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