Merge "Fix dual mode dev ble adv update config issue" am: 9712e53b am: 9f5e8a0d am: 46fb1415

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



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