Merge "Only calls to AudioManager.setBluetoothAudioDeviceCategory() can reset audio type to unknown" into main