[automerger skipped] Merge "Audio HAL HIDL wrapper: Fix incorrect conversion of TTY Mode" am: 867726a9cb am: bb0f7925db  -s ours
am: 5c8d91856f  -s ours

Change-Id: Ifc7500e17b2553e2f4d613cfdaaf9788681a5eee