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

Change-Id: I5e891c190c1c86d33176f83a2e92ce807af45472