Merge "Transform & preserve gainmaps" into udc-dev am: 3bc2f7044d

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

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