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

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



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