Merge "Merge "Handling hearing aid devices correctly" into rvc-dev am: fd839ea1 am: 093dec8e am: 04809b6f" into rvc-qpr-dev-plus-aosp