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

Change-Id: I3f8c20191dd0c0487743181a3895fbd795c9fd73