Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am:...

Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb514 am: debbcadf

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



Change-Id: Ieb771615364eb214abaeceaae3bd5ad34c874125
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>