Merge "[Provider Model] Should show LTE instead of LTE+" into sc-qpr1-dev am: a546852117

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

Change-Id: Iecece435adc76418f60351a2676b91f5e8e2b164