Merge "Update Xbox BT controller mapping to support upcoming controller firmware update"
am: 87700db4ef

Change-Id: Ia43fd4b1458c8979da8d803083696e8dff26ae73