[automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am:...

[automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am: 4de248ae am: 77744e55 am: c86145ce -s ours am: 99c88a16 -s ours am: 043f68f0 -s ours

am skip reason: Merged-In If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc with SHA-1 bd227ae8 is already in history

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

Change-Id: I3fc64f23f11f2bdeda5b8d39769d629fa3be73af