Merge "Merge "Add keylayout for original xbox controller" into qt-dev am: aaaee164 am: 0a7a87b5 am: 16a9a90a" into qt-qpr1-dev-plus-aosp