Merge "Add hearing aid as a BT audio type" into udc-qpr-dev am: be8b899e

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



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