[automerger skipped] Merge "Checks cross user permission before handling intent" into sc-v2-dev am: d6ee2d0a98
-s ours am: b4e56ee1ce
-s ours am: 6bc8e5fe47
-s ours am: ba421e2ce9
-s ours am: 69c8eee276
-s ours
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 c24808f9b6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29011114
Change-Id: I77f00f257fe3a1b421d96300ef1a4ed5c24691a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: