Merge "Gatt: Fix potential NPE during BT OFF" into p-keystone-qcom