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

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



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