[automerger skipped] Merge "Update ActivityEmbeddingUsage" into tm-qpr-dev am:...

[automerger skipped] Merge "Update ActivityEmbeddingUsage" into tm-qpr-dev am: 01a3e770 -s ours am: 35c676ff -s ours

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

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



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