Merge "floss: Support multiple advertising sets" am: 626519f8

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



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