[automerger skipped] Merge "Preserve leading 0s in mcc mnc" am: 593d767e15 am: c2a5c47290 am: efd3dd02b6
am: 7bfad68128 -s ours
Change-Id: I981da46d66bcea83af925d4d72c81884f5bcbb9c
This commit is contained in: