Merge "Ensure repeated connections are captured" am: ec47516c am: 7d1e9f50 am: 0cd81c23

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



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