Merge "HearingAidServiceTest: Improve stability"