Merge "Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a am: b10bbe5e" into rvc-d1-dev-plus-aosp am: a666b723

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

Change-Id: Ic7343816eb48068464bad062feb86387229836ac