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 am: 26621b9146" into rvc-qpr-dev-plus-aosp am: ad8422d0

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

Change-Id: I300a58bb0bfbf415f6b3e6a653f0999b8270a602