Merge "Ensure that LE scan for discovery runs for 12.8s, same as classic...

Merge "Ensure that LE scan for discovery runs for 12.8s, same as classic discovery." into main am: d7eab71e am: 666306bc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3209818



Change-Id: I300cf211e1bda1dde4cbcbcb64513d157a102d31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>