Merge "[Provider Model] Show W+ when connected to Carrier Wi-Fi Network" into sc-qpr1-dev