Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP"...

Merge "Shouldn't show pair another ear dialog if hearing aid supports CSIP" into udc-qpr-dev am: d91da4f4 am: 4560d2f8

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



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