Merge "Allow some cross activity touches" into tm-dev am: 4ac00b46

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



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