Merge "Bluetooth: changes to implement mgmt_encrypt_link procedure" into msm-3.0