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

Change-Id: I968c8232c746027123beac6481161019e1dc64a5