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

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



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