Merge "Add clear_auth_collision_state_on_pairing_complete flag" into main am:...

Merge "Add clear_auth_collision_state_on_pairing_complete flag" into main am: a36ba831 am: 67d60cb9

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



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