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

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



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