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: a3bbaf67 am: b5f98cc4 am: a57ece05

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



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