tree 42db9a35fa4ea73aa454b6d77ab3bdb8ff93b869
parent 2ca0e7b2eeed05278f0fa41483c95172dace4ddb
parent 33be3a80ea251a855cfd09559b4801a60eb2d9d2
author Meng Wang <mewan@google.com> 1574312394 -0800
committer android-build-merger <android-build-merger@google.com> 1574312394 -0800

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

Change-Id: I52c56a08092297b45b57f37f258f38ef5d93b393