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

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

Change-Id: I7131b38a96c8ca4db748047132ce59d1503eb671