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: 37e6382c am: 56d47e16 am: 7753a058

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



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