Merge "Merge "Add keylayout for Xbox One USB controller" into qt-dev am:...
Merge "Merge "Add keylayout for Xbox One USB controller" into qt-dev am: 77c1c938 am: d88c4067" into qt-r1-dev-plus-aosp
am: 899b78de
Change-Id: Iec950df3b5c4a19d5ad81222c325337aee04d523