Merge "Handling hearing aid devices correctly" into rvc-dev am: fd839ea1 am: 093dec8e am: 04809b6f Change-Id: Ic10bd460d864c127bc802f853c35d23b66c05711