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