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

Change-Id: I42b40c946923b2d8b767fec77c6f6b1c566abd72