Merge "Merge "Allow activity in ActivityEmbedding split to get Task windowing mode" into tm-dev am: 8358f51e am: 7c9f75db" into tm-d1-dev-plus-aosp am: f584e7b1

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



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