[automerger skipped] Merge "Fix that hearing aid paring dialog pops up twice"...

[automerger skipped] Merge "Fix that hearing aid paring dialog pops up twice" into tm-qpr-dev am: 50800f68 -s ours am: 04fa370b -s ours

am skip reason: Merged-In If6bb5ddd82c45db678767b359ea8f66da4cc4704 with SHA-1 0f4ad1eb is already in history

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



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