Merge "Enable excluded-input-devices settings for vendor" am: 41a6efb488
am: c6b92c3ad3

Change-Id: I7d3640809ac1bb0670e29438a6ec04545c39baa5