Merge "Bluetooth: Increasing the size of security service record and Adding null check to avoid exception after l2cap psm assigned"