Merge "AudioService: fix regression on hearing aid profile" am: 350176393c am: 69bce647f5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994851

Change-Id: Iad49273782d6072821b91c5c42cccb2bfd19d07e