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

Change-Id: Ia34b51d59af92477fbf61469796b1f3b69085007