Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test"