Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf am: e6164ca72a
am: bf43955a6b

Change-Id: I2d41410fcdb6824e45027412a7b80e16af797346