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

Change-Id: I81a77571ae72459a460679b401ee908b71364aa2