Merge "Fix transition animations for launch-from-staged operation" into tm-qpr-dev am: a59b096a67 am: 186c333ecf

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

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