[automerger skipped] Merge "Update ActivityEmbeddingUsage" into stage-aosp-master am: da047e3a9f -s ours
am skip reason: Merged-In Ic0e0ffcd576eed31a10d682bb0efdff5d1773b7d with SHA-1 ccb2431500 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21482132
Change-Id: I23bc536ad1588dfbbaef4dba5f944ac9238b643a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: