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

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



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