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

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

Change-Id: Iaa096c8d8c656962fcb764c0097d45cef2249dd9