Merge "Bluetooth: Fix erroneous Pairing Failure condition" into msm-3.0