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

Change-Id: Id5e26250c83e43d28b89ebc83b52efa04c76849f