[automerger skipped] Merge "Changed regex matching for MCC and MNC" am: 5ffb4ad657 am: def0631caf
am: ac53ebf4ba -s ours
am skip reason: change_id Iaeb9ff9e2a5a82be66855378831cd52ee49e3c5c with SHA1 e3228ca3fd is in history

Change-Id: I56a77be4df59cb89310e206fe85ad691b5c6b062