[automerger skipped] Merge "Merge "Allow some cross activity touches" into...

[automerger skipped] Merge "Merge "Allow some cross activity touches" into tm-dev am: 4ac00b46 am: 1f54fc5d am: 2afe5369" into tm-qpr-dev-plus-aosp am: 6b324255 -s ours

am skip reason: Merged-In Icd1668f465ba01b330c056d9ea95aed6104fc6a9 with SHA-1 2d1aff99 is already in history

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



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