Merge "Ensure repeated connections are captured" into tm-dev am: ef4c16a7 am: c656e0e3

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



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