Merge changes from topic "convergence_sydney_adi_support" am: 909bc71f am:...

Merge changes from topic "convergence_sydney_adi_support" am: 909bc71f am: c236fdb9 am: 3c7f10d2

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



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