Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test" am: e4ee88f108

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

Change-Id: I4183e7b55ef9e68c5dfbe2ea908a8d8b9222115c