[automerger skipped] Merge "Ensure repeated connections are captured" into...

[automerger skipped] Merge "Ensure repeated connections are captured" into tm-dev am: ef4c16a7 -s ours am: 4a60007f -s ours am: e8e4928d -s ours

am skip reason: Merged-In I340b723e805c0b94128bf6665690571f09dc9529 with SHA-1 16b4e991 is already in history

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



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