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

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

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



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