Merge "Bluetooth: Increased the LE connection supervision timeout" into msm-3.0