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

Change-Id: I2b9556c0b800d2d611896618072f6ab8d45951b6