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

Change-Id: I9a866a2249a51f074c87c194df8ed0df2f34801b