Merge changes from topic "splitscreen_singletop" into tm-dev am: 64d76ce0 am: 649c0b70

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



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