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

Change-Id: I7583cecb5f4df83802520ec81a37662e3dae57fa