Merge changes from topic "convergence_sydney_adi_support" am: 909bc71f

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



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