[automerger skipped] Merge "Enforce system privilege for getGlobalProxyAdmin"...

[automerger skipped] Merge "Enforce system privilege for getGlobalProxyAdmin" into sc-v2-dev am: c826749c am: c374f3d8 -s ours

am skip reason: Merged-In Id4bce828bc69867c9c4d20b991e9e53e8ae385f2 with SHA-1 554e19a3 is already in history

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

Change-Id: I3711ef8623fc333a39354e5b7ce13c4bf3594442