[automerger skipped] Update ActivityEmbeddingUsage am: 36e9bf03 -s ours am:...

[automerger skipped] Update ActivityEmbeddingUsage am: 36e9bf03 -s ours am: 0c8fc01b -s ours am: 737797f9 -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: I80d09ce102db0e0b7de0e822e5a3103b0f3439de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>