[automerger skipped] Merge "Remove location mccmnc check until valid sources are confirmed" am: 9d0a6b7d2a
am: c66002558a -s ours
am skip reason: change_id I4186ab71e56da68489cb51a61427c8d87634ec2a with SHA1 a71fd4824e is in history

Change-Id: I9ffb9606d6a0c11a3c5495f2ce816cc9bab26755