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

Change-Id: I1d23a8f8ffcf203d65478611f631479cc1361802