Merge "Exposed UserManager.getDisplayIdAssignedToUser as @TestApi" into udc-dev