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

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

Change-Id: Ife08c3f20a9b246dbae0fca68375717cf5239465