[automerger skipped] Merge "Update ActivityEmbedding Usage" into...

[automerger skipped] Merge "Update ActivityEmbedding Usage" into tm-qpr-dev-plus-aosp am: 797a9a9a -s ours

am skip reason: Merged-In Ic0e0ffcd576eed31a10d682bb0efdff5d1773b7d with SHA-1 0986205d is already in history

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



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