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

Change-Id: Ifdfbe42e72732b58eb65cb41b2a239652ffe777d