Merge "Finish fixed rotation of transient launch with corner cases" into...

Merge "Finish fixed rotation of transient launch with corner cases" into udc-qpr-dev am: 9f19dfb2 am: 3c8c3857

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



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