Merge "Fix that hearing aid paring dialog pops up twice" am: 2df0685b am:...

Merge "Fix that hearing aid paring dialog pops up twice" am: 2df0685b am: 279d125e am: b2e86143

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2428852



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