Merge "Add new API BluetoothAdapter#removeActiveDevice to replace calls to BluetoothAdapter#setActiveDevice with a null device" am: f0f3a0f48e am: 44d8a611c4 am: 96c736b92c

Change-Id: Id0be090915b319b8f38a624279cec31c9cfd62c1