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

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



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