Merge "Merge "Add keylayout for original xbox controller" into qt-dev am: aaaee164de am: 0a7a87b548 am: 16a9a90a56" into qt-qpr1-dev-plus-aosp
am: 5b187472ea

Change-Id: I4a09d3379ba73650dda2c59ddd38953748c115f2