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: fc27dffd am: 8c70914e

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



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