Merge "Bluetooth: LE sockets not ready until encrypted" into msm-3.0