Merge "Bluetooth: Avoid putting LE Conn into sniff/active" into msm-3.4