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

Change-Id: I6722c1b8d839918e2ce7918f5f7b8583a14c1ded