BluetoothChat: Clean up code
am: ae9c44ad7c

Change-Id: Ied510c41a38f51d1fa9cfa2f03f80aed953ac67c