Merge "Add logic to hide HCO and VCO for TTY based on RTT am: 70bbd2b020 am: cdf243e70e" into qt-qpr1-dev-plus-aosp