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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15799650

Change-Id: Ie8094baad42c8c0292533c46181683f59116aca9