Merge "Use TelephonyManager instead of ITelephony Binder" am: de953fd5f2
am: f1b067c671

Change-Id: Iba67484246e81361ed540592558371cd7f2352c6