[automerger skipped] Merge "Track LE hearing aid connected devices" into...

[automerger skipped] Merge "Track LE hearing aid connected devices" into tm-qpr-dev am: 08b9ee36 -s ours am: 6a98d968 -s ours

am skip reason: Merged-In I0b706b0bdae72d62469a6fa85353f4dcfa9e296b with SHA-1 94301e64 is already in history

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



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