Bluetooth: fix issues re-enabling after crash
am: fa63068deb

Change-Id: I89c5253d284b64359c1abc5c078bcd69bedfc503