Merge "Merge "Disable Bluetooth if BLE was disabled while enabling" into...

Merge "Merge "Disable Bluetooth if BLE was disabled while enabling" into rvc-dev am: 01252f4b am: 3e5586b2c9" into rvc-d1-dev-plus-aosp am: 8626f485c7 am: 5f6e74d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11593908

Change-Id: I6f8b777460ab3a3bfd96f999d45f1b3d2f74239c