[automerger skipped] Merge "BluetoothDevice#getUuids() returns null again when no Uuids" am: faa507ef am: 5fcad96d -s ours am: 750210de -s ours

am skip reason: Merged-In If8aafc1b0ab4e253fdacc827726d76825b3bd1e4 with SHA-1 aa512dab is already in history

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



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