Change how we set the mobile operator name.

Prefer "Name (MCC+MNC)", and use one or the other if
not both are available.

Bug: 11161234
Change-Id: Ie281907d21f2b2685bf5575e4e822aad1e93bb3d
1 file changed