Merge "BT: Remove dead code in BluetoothHeadset" am: ea7363402c am: 38ae4d2fce
am: aa9829a85a

Change-Id: I451ab8e379cc73b0c592920478e5d5a5761be795