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

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



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