[automerger skipped] Merge "Consolidate existing LE connection after pairing"...

[automerger skipped] Merge "Consolidate existing LE connection after pairing" into tm-qpr-dev am: 463ea77b -s ours

am skip reason: Merged-In I0692ea26a350a38d175508698f11034aa40b0dac with SHA-1 3ce89780 is already in history

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



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