Merge "CSD: Remove hearing aid devices for sound dose" into udc-dev am:...

Merge "CSD: Remove hearing aid devices for sound dose" into udc-dev am: 5646799a am: 459e22da am: 485a5f96 am: 88ffb374

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



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