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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681445

Change-Id: I705f617f14666683159b4f8dea93b120f14565e7