Merge "Do not skip finishing async rotation by a non-rotation transition" into...

Merge "Do not skip finishing async rotation by a non-rotation transition" into udc-qpr-dev am: 4b8e8ea3

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



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