Merge "Clean new TelephonyManager API."
am: 8d8921d7fc

Change-Id: I6a6ffe87a6b19f5723da955308ec39c83ed5aca3