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

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



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