Merge "Fix a few bugs in btm_ble_batchscan_filter_track_adv_vse_cback" into tm-dev am: aa366309

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



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