[automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission...

[automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec6 -s ours am: f927599e -s ours am: 97e33fc9 -s ours am: 439a39b8 -s ours am: e87c0617 -s ours

am skip reason: contains skip directive

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



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