Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""

author Pankaj Kanwar <pkanwar@google.com>

Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)
author Pankaj Kanwar <pkanwar@google.com>
Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Pankaj Kanwar <pkanwar@google.com>
	Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)