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

Change-Id: I333aa64ab7d2ad3467240feb02d66f197bfe4241