[automerger skipped] Merge "Update ActivityEmbedding Usage" am: 1d09d64460 -s ours am: 9ac01843cf -s ours am: b93c4fd089 -s ours

am skip reason: Merged-In Ic0e0ffcd576eed31a10d682bb0efdff5d1773b7d with SHA-1 36e9bf03ef is already in history

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

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