Final fixes on UserManager.getUsers() refactoring.

Test: m
Fixes: 157921703
Bug: 162888972

Change-Id: I91df9d560719976a35ba5c1c7cef54319ecfe381
Exempt-From-Owner-Approval: just changed TODO comments
2 files changed