am 936cec67: am 757ecedc: Merge "Remove use of hidden TelephonyManager methods"

* commit '936cec67ede8368f80fc2946e537fe992f5d00cf':