[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 -s ours am: 2062a6ae -s ours

am skip reason: Merged-In I9e4abfe6d22ac48f50bdec362597a028359dcc9f with SHA-1 97014eff is already in history

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



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