Merge "Add carrier config key for TTY support." am: 16f6deae44
am: 61ccd176f0

Change-Id: Ia4efbe04195934e4320ac3ae9f9eaf49ee66350f