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

Change-Id: Iaa9607806518cad21f49fa3b98eac4a50509aac5