[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: a9607947 -s ours am: f6c0142a -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: If2f8992888f56e0ffbf2405ebc89addf28f120ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>