[automerger skipped] Merge "Add edge extension for ActivityEmbedding Shell...

[automerger skipped] Merge "Add edge extension for ActivityEmbedding Shell transition animation" into tm-qpr-dev am: 9baf3ce9 am: c76206f3 -s ours

am skip reason: Merged-In I6a89b549e7b117caae75ceba6df8f41f5c4d4a15 with SHA-1 da935d00 is already in history

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



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