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

Change-Id: I52c56a08092297b45b57f37f258f38ef5d93b393