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 am: 4565b5bd

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



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