Merge "Fix error of LE_MULTI_ADVT" am: bce07a79 am: ddb5e0b7 am:...

Merge "Fix error of LE_MULTI_ADVT" am: bce07a79 am: ddb5e0b7 am: 38f15eb7 am: 30e8a5b3 am: c63a2367

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



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