Merge "Add New TelephonyManager APIs"
am: b65aca27af

Change-Id: If2ebccdaa628321e3d158b87f35ea893eecc3e18