[automerger skipped] Merge "AudioService: fix regression on hearing aid...

[automerger skipped] Merge "AudioService: fix regression on hearing aid profile" am: 35017639 am: 69bce647 am: fd64ffbe -s ours am: fbbc3b9f -s ours am: bbacff8f -s ours

am skip reason: Merged-In Ie3f8757f5fec78df2da028791e9ba2ebb5833675 with SHA-1 f61f1745 is already in history

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

Change-Id: I8988818dbc409001eddf955ee4423070d5a56c5e