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

Change-Id: I3b3d62e93dd20dabdddd70a76cdca521b0fd8c2a