Merge "Fix ActivityEmbedding animation flicker" into tm-qpr-dev am: 4715d968 am: 57e7d839

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



Change-Id: I67a1ecc410dbdbed24ce0b6628b51f98c42be051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>