[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 skip reason: Merged-In I38469ad5df100e90aba81bbdc82078b568301f09 with SHA-1 0b488bfd is already in history

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

Change-Id: I6d53dbe5d7e860b4f4551f22bbcac099abb8fdea