Merge "defconfig: msm: Enable CONFIG_HID_SONY for SDM845 and SDM670"