[automerger skipped] Merge "Checks cross user permission before handling...

[automerger skipped] Merge "Checks cross user permission before handling intent" into tm-dev am: 876787b6 am: b15e7be2 -s ours am: 30e240f8 -s ours

am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 964908bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010757



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