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: 82051d86

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



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