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: If28911be774fad520cd999349d9433cd7769d501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>