Merge "floss: services are resolved when receiving uuids" am: 39a11b9e am:...

Merge "floss: services are resolved when receiving uuids" am: 39a11b9e am: ae1f8377 am: a40dacac

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



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