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

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

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



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