Merge "Query role-holders for the correct user." into udc-dev am: 1a88725d14 am: 495f0c3873

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/22462093

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