Merge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
am: 1bf8782605

Change-Id: I60d35a8139caf0a1c839654d6c488fede4fa37d7