Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd am: acffb5cc5a am: 31f4fd40b0 am: f8270ee51e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: I03e56a3ecfe672bedda705e8f13f0f9b7376478c