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: 9f089061 am: 2b04bfdb

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



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