[automerger skipped] Merge "Update ActivityEmbeddingUsage" into...

[automerger skipped] Merge "Update ActivityEmbeddingUsage" into stage-aosp-master am: da047e3a -s ours am: e3c992d6 -s ours am: c14cb224 -s ours

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

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



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