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

Change-Id: Iafaaea922666f5cbcb9020abfddfcf04b7be12d6