[automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am: 43dc028b9f am: c567eb89a2 am: 376a846517 -s ours

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

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

Change-Id: I29ce6476762b1b4de205481ee8a5cab251220880
tree: 376279422b404f0d420a8409a3a227725a361d76
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING