Merge "Fix a crash when sending service discovery uuids" am: 2f873def am:...

Merge "Fix a crash when sending service discovery uuids" am: 2f873def am: 8ab3a131 am: c896b8c3 am: d3e98b4a am: c71c4d1b am: fc733a7e

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



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