Merge "Bluetooth: Remove _bh locking for AMP Manager" into msm-3.0