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 am: c62ab3d2

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



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