Merge "Bluetooth: Align socket option definitions with upstream kernel" into msm-3.0