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

Merge "[automerger skipped] Merge "Allow some cross activity touches" into tm-dev am: 4ac00b46 am: 0b682b2d -s ours" into tm-d1-dev-plus-aosp am: eb3c32e0 -s ours

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

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



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