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

Change-Id: Ic6db847259207210f000a3463928e97dbae1b4f8