Merge "Change default number of trackable advertisements for onFound filter"...

Merge "Change default number of trackable advertisements for onFound filter" into main am: d82b7934 am: abe34255

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



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