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

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

Change-Id: Iad4b613d78cb3ad3d362a823daf2684405d4649f