[automerger skipped] Merge "BT_MAINLINE - Clean calls to Ws.getTags Ws.GetUids" am: 51018626 -s ours

am skip reason: Merged-In I0ee8e486269a6687ca822854c631a13289fe9f30 with SHA-1 c64a26cb is already in history

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

Change-Id: I3718f82a45115f4bcd80a79820469bf83a43d053