Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25 am: a51173943a
am: 599a4c7326

Change-Id: I243647791bc08dbc2653d6d51af07a41c8ba3f97