Merge "Merge "Allows splitscreen with work & personal version of the same app"...

Merge "Merge "Allows splitscreen with work & personal version of the same app" into udc-dev am: 11e4f30b" into udc-dev-plus-aosp am: 95e67662

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



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