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: Idd9797229b98da01d14a819121668d9ea569e6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>