[automerger skipped] Merge "Update ActivityEmbedding Usage" am: 1d09d644 -s...

[automerger skipped] Merge "Update ActivityEmbedding Usage" am: 1d09d644 -s ours am: 9ac01843 -s ours

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

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



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