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

Change-Id: Ia5a08318ebdfdee7634a6cec492b36f35e143870