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

Change-Id: I6172adeb2489abede44555b17340a6e58e23fafe