Merge "floss: fix duplicated reg_id while starting multiple advertising sets"...

Merge "floss: fix duplicated reg_id while starting multiple advertising sets" am: 99dca798 am: aa13a5d9 am: afcd0a92

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



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