Merge "Global settings for Bluetooth (Settings.Global.BLUETOOTH_ON) must be...

Merge "Global settings for Bluetooth (Settings.Global.BLUETOOTH_ON) must be set to BLUETOOTH_ON_BLUETOOTH whenever non-BLE MESSAGE_ENABLE is handled irrespective of the state." into sc-v2-dev am: aab8a8ec0f am: b79a3e4a

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

Change-Id: Iaf032ff1212c8accfc42e4a09bcf02d5d959fea6