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: fe61b9b9

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



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