[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "activity-embedding-finish-tests-1" into sc-v2-dev am: 2df58a47 am: ec18e866 -s ours

am skip reason: Merged-In Id773ac3f0afea198ad4f8b4594d7a4cf0ad98ea8 with SHA-1 cb239e07 is already in history

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

Change-Id: Ib5946cf9cee73ee29a128f8cd1b49924929521bb