Merge "Merge "Handle a pair of hearing aid devcies" into rvc-dev am:...

Merge "Merge "Handle a pair of hearing aid devcies" into rvc-dev am: 93e4930a am: 81d14d3d am: 8bf90c04" into rvc-qpr-dev-plus-aosp am: 40a795db

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

Change-Id: I6c1284f8fb19f5dc9bc873d1b6d268b86681a049