Merge "Introducing OEM partner custom input type (HW_CUSTOM_INPUT)"