[automerger skipped] Merge "Save UUIDs using properties rather than the...

[automerger skipped] Merge "Save UUIDs using properties rather than the pairing_cb_t" am: aec00c77 am: 1954ec19 -s ours

am skip reason: Merged-In I31101f2607a3fe63bfec3b482f4dafceebe0ebe4 with SHA-1 1ecc7c64 is already in history

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



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