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

Merge "Allows splitscreen with work & personal version of the same app" into udc-dev am: 11e4f30b am: 2f780b08 am: b046fd2b

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



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