Merge "Flag to guard clearing collision state on pairing conclusion" into main am: 2fbf5d3e

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



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