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

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



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