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

[automerger skipped] Merge "Checks cross user permission before handling intent" into sc-v2-dev am: d6ee2d0a -s ours am: b4e56ee1 -s ours am: 6bc8e5fe -s ours am: ba421e2c -s ours am: 69c8eee2 -s ours am: 6a70dea9 -s ours

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

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



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