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 am: 1e995271

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



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