Merge "Prevent modification of TTY setting while in video call or conf call." into nyc-mr2-dev
am: 7f7ff14add

Change-Id: Idd35c38018aff9127290775e525cc1baa59f8759