Merge "TelephonyManager: do not acceess hidden API"