Merge changes from topic "activity-embedding-finish-tests-1" into sc-v2-dev am: 2df58a47

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

Change-Id: I7c75214d6ca18355cb155529de8a83a79de97733