Merge "btif: fix bond state callback state mismatch" am: 1b21e291 am:...

Merge "btif: fix bond state callback state mismatch" am: 1b21e291 am: 53501ea3 am: 949def4b am: a5c5df70

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



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