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

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



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