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

Change-Id: I0d234fd2539a3a9ec58c820a7a7428430aa2255a