Merge "Revert "Set a floor value for BLE Batch Scan report delay of 5000ms""