Merge "BluetoothChat: Clean up code am: ae9c44ad am: d1f9e0ff am: 17c9503c" into nyc-mr2-dev-plus-aosp