Merge "Launch all activities into the same display" into tm-qpr-dev am: 40501ac4

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



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