Merge "Merge "Handling hearing aid devices correctly" into rvc-dev am: fd839ea1 am: 0ff301f6" into rvc-d1-dev-plus-aosp