Merge "Transform & preserve gainmaps" into udc-dev am: 3bc2f704 am: 1bf72c16

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



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