Merge "BTGatt: Fix potential NPE during monkey test." into p-keystone-qcom