Merge "Fix WifiConnectivityManagerTest test" into udc-mainline-prod