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

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



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