Merge "Remove blocking binder call to WifiManager" into udc-dev