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

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

Change-Id: I67ece64f257cfd66c4c9cb65526e493bd43bc64c