Merge "Merge "Disable Bluetooth if BLE was disabled while enabling" into rvc-dev am: 6e97539e am: 3e5586b2" into rvc-d1-dev-plus-aosp