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

Change-Id: Ibea3aa437043da3592c79f7d0889206aea95d795