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

Change-Id: I6cfe294b8767ac15b4e4e4ec880522181703c6b5