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 am: 4d35a782

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



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