Merge "[Provider Model] Should show "Connected" and highlight carrier layout as well if connected to W+" into sc-qpr1-dev am: 2494a839 am: e7284cb2 am: 753346e2

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

Change-Id: I469a4399ca29b9f79c7cb933db2caf6e16e88294