Merge "Avoid NPE when removing fixed rotation transform" into udc-dev am: 54f6fb6d

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



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