Merge "GD: fix error of multi advertiser track" into tm-dev am: 49c1a28e am: d989f17b

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



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