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

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

Change-Id: Ia2a73845fb92c457b37bacef7542aa47535560d4