Merge "Require COARSE_LOCATION for TM.getAllCellInfo" am: b5c4fb6f59 am: 28c9685c0e
am: cacc8da350

Change-Id: Icbdf64399ad8a410958903538b75d241c102fe01