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

Change-Id: I9d82cab156e81e87faf965ed1c9b37bc73359cc0