Merge "Merge "Fix permission check for TelephonyManager#isTtyModeSupported." am: 2052fba2 am: f8f559fc am: a648cac0 am: b18b1217"