Merge "Clean up stale fixed rotation state" into udc-qpr-dev am: 706c4bcf am: 02bb97ba

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



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