Merge "LTE+ indicator not shown when attached to CA network" into rvc-dev am: e6e7cdf1af am: ca0e61c797

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

Change-Id: Ida883e74c541a3c322cec233c42cb666706815a5