Merge changes from topic "convergence_sdp_serialization" am: 0112684d am:...

Merge changes from topic "convergence_sdp_serialization" am: 0112684d am: d0c4d1f6 am: 2b7a668d

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



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