[automerger skipped] Merge "AudioDeviceBroker: restore use of hearing aids by...

[automerger skipped] Merge "AudioDeviceBroker: restore use of hearing aids by default for VoIP calls" into udc-dev am: 4e54a895 am: 5ceb8a12 am: 3544563b -s ours am: e042c985 -s ours

am skip reason: Merged-In I9e4abfe6d22ac48f50bdec362597a028359dcc9f with SHA-1 6db4ead4 is already in history

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



Change-Id: Ie59f5cad25cd1399fdc9cc5af5ce92dbbfa50158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>