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

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

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