[automerger skipped] Merge "DO NOT MERGE: Revert "Enable cross-user...

[automerger skipped] Merge "DO NOT MERGE: Revert "Enable cross-user requests."" into sc-v2-dev am: 4da674b5 -s ours am: 569cbb8d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15927319

Change-Id: Ic36751014edd3152edc1a5d8dafb0b28e9926504