Merge "Merge "Allow activity in ActivityEmbedding split to get Task windowing...

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 am: 46845baf

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



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