Merge "Consider sourceRecord when launching with adjacent flag" into...

Merge "Consider sourceRecord when launching with adjacent flag" into tm-qpr-dev am: 140c5060 am: b5f6f1f6

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



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