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

Change-Id: Iea7ad6279ee955636ed6c9edbc7d11ceff4d8b20