Merge "LTE+ indicator not shown when attached to CA network" into rvc-dev am: e6e7cdf1af am: 8e13cb99fa am: 807b7c5e86

Change-Id: I187247e7ed8680d41999c72b9f1d32b84e291cd7