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

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

Change-Id: I8ae349015b6829c5f0830c6f371b7ad022f783e7