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." am: 28c8ad15b6 am: 19703c51c1 am: c12bee0a2d

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

Change-Id: I37fd96b39623035cf5f63caebd14ff60830daedc