Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev am: f77ca5fa18
am: eac9538c5c

Change-Id: I2eb357a770e8495c989caf0b092adc754b436d9c