Merge "Update Xbox BT controller mapping to support upcoming controller firmware update" am: 87700db4ef am: 7f1e92a654 am: b2cfc86e8b am: 37f8b552d3
am: 71b94722cb

Change-Id: If3d23854ba967939d61d095c0358b678ddcb68ac