Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd

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

Change-Id: Id19cdd1a8ff7dfb4093ca09b4397619097310dc4