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

Change-Id: Iad69e2f184df54ffbb2d7169e45345c80547b010