Merge "Remove 'Media' type Audio output in Hearing devices settings" into...

Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702a am: 8d388540

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078



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