Merge changes from topic "splitscreen_singletop" into tm-mainline-prod am: 4c53fee2

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



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