Merge "GD: fix error of multi advertiser track" am: bd8cfa5b am: 6e528e1c...

Merge "GD: fix error of multi advertiser track" am: bd8cfa5b am: 6e528e1c am: c5c36f83 am: 404753e4 am: 41acf66e

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



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