[automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am: 4de248aecc am: 77744e5554 am: c86145ce4c -s ours

am skip reason: skip tag Change-Id If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc with SHA-1 bd227ae8c8 is already in history

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

Change-Id: I29ce6476762b1b4de205481ee8a5cab251220880