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

Change-Id: Icd9d8ee8be9a4dafcca5ae6808b167c49e2e9e9f