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: 8c0f2709 am: 9be12e45

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



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