Merge "Re-implement NetworkUtils#queryUserAccess." am: 4de248aecc am: 77744e5554

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

Change-Id: I8c016c0056fd29e60d89d5a90e75a7305ad73231