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

Change-Id: I4d58411d68c80b8bd8971d9b71512bd371094945