Merge "[Provider Model] Should show "Connected" and highlight carrier layout...

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

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

Change-Id: Ibf3a73a961fc4ea2591957684bdc3bcbe7e94717