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

Change-Id: I3e7b3fb0cc9c8cc9a6377cca9b9e3c54d192fd33