[automerger skipped] Merge "Update Xbox BT controller mapping for new FW" into qt-dev am: 1f978f5a8f am: 307e57c9a3 am: 8a7c8e676a -s ours
am: f625a5a614 -s ours
am skip reason: change_id I8600ea79a0aa8557267d6ca712e5d56680e7a98b with SHA1 f829b5df5e is in history

Change-Id: Id969f4bd41508d32df9490e0f2116d856a8e43fa