Merge "Finish rotation controller if the pending change is gone" into udc-dev am: 47641a3272

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

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