Merge "Flag to guard clearing collision state on pairing conclusion" into main...

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

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



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