Merge "Merge "Clean new TelephonyManager API." am: 8d8921d7fc am: a0706e3590" into pi-dev-plus-aosp
am: a1aa519da5

Change-Id: I8817fd2b8cb4ba45f56edf6e31426382320e3daa