Merge "Bluetooth: fix issues re-enabling after crash" am: e2c22e38d5 am: ff0d3e1c8d  -s ours
am: 7fd7bc57ee

Change-Id: I711edb691cd0cbbd4c5f52d4ebdc27fd7adb2d26