Merge "Fix permission check for TelephonyManager#isTtyModeSupported." am: 2052fba20a
am: f8f559fcd8

Change-Id: Ia612212ae54e5ca0e3f56b3d48f5d66a829f0b2c