Merge "HID: Fix the potential NPE in HidHostService jni callback" into p-keystone-qcom