Expose more useful user IDs

Test: builds
Bug: 186126194
Change-Id: Ic70707c10fa36be0e5d029d093beeabdeacb7d22
2 files changed