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

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



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