Merge "Make TelephonyManager APIs public:" am: 441bfc6718 am: 104a5c7a34
am: bab9a7e66e

Change-Id: Ie57e56db0d87968524bc7dc39b2d1061c4ec88b3