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

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



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