Merge "BT: Update wait function in ManagerService to handle  BLE states" into android-framework.lnx.2.0-dev