[automerger skipped] Merge "Allow some cross activity touches" into tm-dev am: 4ac00b46f4 am: 0b682b2d3e am: 8c31598d5e -s ours
am skip reason: Merged-In Icd1668f465ba01b330c056d9ea95aed6104fc6a9 with SHA-1 b9d9d7adeb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188205
Change-Id: I51a3a630b65e49f9ffd4c99dce19197fd81ce70e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: