Merge "Re-implement NetworkUtils#queryUserAccess." am: 43dc028b9f am: c567eb89a2

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

Change-Id: I8c016c0056fd29e60d89d5a90e75a7305ad73231