[automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am: a99e50dbf7 am: 7c9169bd61 am: 14c40c0c95 -s ours

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

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

Change-Id: I29ce6476762b1b4de205481ee8a5cab251220880
tree: d578046719b3ab883608c9090116b677ffceb2fd
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS
  6. TEST_MAPPING