Merge "Updated UserUtils" into rvc-dev am: b83024d550 am: e53139cdbe am: 56a9491844 am: b62a0d0868 am: cfc2606d3e am: 71b7a218b7

Original change: https://googleplex-android-review.googlesource.com/c/platform/platform_testing/+/25127845

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