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

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



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