Merge "Update Xbox BT controller mapping for new FW" into qt-dev
am: 1f978f5a8f

Change-Id: I0eb40c78586f0593615fe6f0ab3e7c985c563fbf