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

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



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