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

Change-Id: I88e7f2832bc3be88c5493b3c39f4abba8b4e1985