Merge "Flag for resetting security flags on pairing failure" into main am:...

Merge "Flag for resetting security flags on pairing failure" into main am: dcf1bcb6 am: 500dd520

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



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