Merge "Add carrier config for hiding TTY HCO and VCO" into qt-r1-dev am: 7033e7f4f1
am: d790d2880a

Change-Id: Ib2aaed57f389b90711e55c9d9ad335fb922beef3