[automerger skipped] Merge "LTE+ indicator not shown when attached to CA network" am: 1926b83e85 am: 50612d1d1c -s ours am: dbe7000a8a -s ours am: 8b1dec936d -s ours am: cac1dbf459 -s ours

am skip reason: Change-Id Ie6c07cb58d2a40eeb10e8f0131c98212ba463517 with SHA-1 8a41bbf466 is in history

Change-Id: Ia034659c2b521b51c8f7517fa6196d478c819434