[automerger skipped] Merge "Finish rotation controller if the pending change...

[automerger skipped] Merge "Finish rotation controller if the pending change is gone" into udc-dev am: 47641a32 am: 008ac7ea -s ours

am skip reason: Merged-In I8d0e5bd07414f39fb8aca7cf33a01dcf0ae7956e with SHA-1 a8881054 is already in history

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



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