Merge "Fix a few bugs in btm_ble_batchscan_filter_track_adv_vse_cback" into...

Merge "Fix a few bugs in btm_ble_batchscan_filter_track_adv_vse_cback" into tm-dev am: aa366309 am: 9a0637dc am: 6c4c2d2b

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



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