[automerger skipped] Merge "Add New TelephonyManager APIs" am: b65aca27af
am: d9c53abba3  -s ours

Change-Id: If60cb221ed135ad36a89bb9f1bfb3e54a51dd3bd