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

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



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