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

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



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