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

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

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

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